Supersede color.diff settings in git log (bug#5211).
authorJuanma Barranquero <lekktu@gmail.com>
Mon, 28 Dec 2009 02:45:47 +0000 (03:45 +0100)
committerJuanma Barranquero <lekktu@gmail.com>
Mon, 28 Dec 2009 02:45:47 +0000 (03:45 +0100)

Trivial merge